From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 25 Aug 2020 16:27:28 +0000 (+0100)
Subject: Merge version 5.14.2+dfsg-5+rpi1 and 5.14.2+dfsg-6 to produce 5.14.2+dfsg-6+rpi1
X-Git-Tag: archive/raspbian/5.14.2+dfsg-6+rpi1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=57e7a1b92f136cbabbd4bee719dda1c10df6b6ca;p=qtbase-opensource-src.git

Merge version 5.14.2+dfsg-5+rpi1 and 5.14.2+dfsg-6 to produce 5.14.2+dfsg-6+rpi1
---

57e7a1b92f136cbabbd4bee719dda1c10df6b6ca
diff --cc debian/changelog
index e4d917105,c03d30481..169acc434
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,12 +1,22 @@@
- qtbase-opensource-src (5.14.2+dfsg-5+rpi1) bullseye-staging; urgency=medium
++qtbase-opensource-src (5.14.2+dfsg-6+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 16 Aug 2020 23:56:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Aug 2020 16:27:27 +0000
++
+ qtbase-opensource-src (5.14.2+dfsg-6) unstable; urgency=medium
+ 
+   * Backport upstream patch to fix buffer overflow in XBM parser
+     (CVE-2020-17507, closes: #968444).
+   * Backport upstream patch to handle SSL_shutdown's errors properly
+     (CVE-2020-13962).
+   * Update symbols files from buildds’ logs.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 19 Aug 2020 20:40:32 +0300
  
  qtbase-opensource-src (5.14.2+dfsg-5) unstable; urgency=medium